more cleanup for hardcodeings