Cleanup and addedd missing files