cleaning up todo's etc