Removing stuff not needed anymore