Cleaned up commented out code and killed off ins and outs.