Cleaned up project and got rid of commented code that is no longer being used.