Cleaned up some unused lines of code