Attempting to clean up master branch