Fixed: Forgot to remove some messy code