Moved before/after block to specific with encoding section
Remove outdated comments