Remove unused code
Add requires