Cleaned up leftover code