Cleanup: removed hardcoded valued, which should be read from XML