Split finished and working
Removed bak files