Removed troubleshooting print and added TODO to fix bad code