Removed the extra features Ulrich asked for