Cleaned up syntax and removed unused files