[FIX] Fixed bug and removed unwanted definitions.