Removed dead code :octopus: