Whoops, some of code deleted was being used. :S