more code/file cleanup