cleanup of current codebase