cleaned up leftover code