#25 All excessive functionality was reduced