Removed unnecessary functional interfaces