Cleanup and removed redundant file