Removed unused code blocks