Removed stupid commented out old code