initial cleanup for revamp