Cleaned out master branch