Cleaned up unused code from project 1 and SO