- Minor cleanup, removing unnecessary code