Remove unneccessary case
Optimise