Remove unused function prototypes
Remove commented code