catalyst: Remove commented sections of code