Required Functionality cleaned up