Cleaned up some code that is no longer necessary