Cleaned up code of unnecessary garbage.