*Cleaned up for JSLint
*Removed unused JS