Cleaned up unneeded code