Code Cleanup

Cleaned up random and unnecessary data