Removed jquery dependance and removed commented out functions