Removed unneccessary code with gutting