Clean up reduntant code