Cleaned up and got rid of some code.