removed code that wasn't in master branch