Cleaned up the add and remove watchlist logic