Cleaned out unneeded parts