Some cleanup of source files