Cleaned up code

I cleaned up my code so that the things that were not being used, I got
rid of.