Removed deprecated things

This PR also add some comment docblocks