removed some code blocks