BCCVL-124: Clean up code and directories