Remove dev stuff from master branch