Removing unnecessary class and final touches.