Cleaned up some unused code and modified README