moving hardcodes from lib to main
- dead code