removed: code cleanup