Removed some unnecessary garbage