cleanend up Control