Cleaned out unneeded code