cleanup for restructuring
2 files changed