general cleanup for redundancy