cleaning up unnecessaries