Removed subfunctions