Removed mapped pres and handlers for now