Remove obsolete stuff
Separate parser from config