Removed small stuff