Remove maps support lib