remove a swo
add those unnecessary methods back so I can delete them live