Committed code cleanup