Re-enabled all compilation, removed debugging prints