Cleanup of unneeded parts