cleaned up unnecessary files
merged after cleanup