cleaning up code...safe to revert