cleanup of unneeded parts