Tested code cleanup