Redundant behaviours removed