cleaned up files for merging