Clean up code and sort out some errors
Stop using browserify until it is neccesary
cleanup