Some fixes for comments
Remove unneeded partial