Removed mistakenly merged items
Removed mistakenly merged portion of code
Regenrated minified version to include latest changes