Cleaned out master branch code