Take out unneccessary code