Removed debug prints
Commented out unused vars