Unused logic removed