Removed partial functionality