Cleaned up some unneeded code