removed some crap from bottom of file, was a result of merge error