Removed redundant stuff and compiled under ES 1.3.4