Cleanup - delete ugly code