Removed special cases from inbound action