And cleaning up redundant definitions
And cleaning up redundant definitions

ZomgPonies/Paradise64,ZomgPonies/Paradise64,ZomgPonies/Paradise64,ZomgPonies/Paradise64,ZomgPonies/Paradise64,ZomgPonies/Paradise64