removed some code because of b6ccaf4 handles it
removed some code because of b6ccaf4 handles it

uaprom-summer-2015/Meowth,saklar13/Meowth,uaprom-summer-2015/Meowth,saklar13/Meowth,saklar13/Meowth,uaprom-summer-2015/Meowth,uaprom-summer-2015/Meowth,saklar13/Meowth