Removed code no longer needed