Cleaning up the lib directory for TODO items