cleaned up the code for not commited features/ changed features/ cached features. The 'memory critical' parts should now only happen in editing mode