Align code and remove dead code blocks