Fixed issue: Removed not needed files
Fixed issue: Cleanup code