Remove export statement, put back flags