cleaning up unec stuff