Removed some unused code/logic.