First step of META build system cleanup