Cleanup, added new file