Cleaned up remove and update methods on api