Removed/commented out some testing stuff