Preparation to remove SQL support for boards