Cleaned up and removed js