Minor refactoring. Removed unusable elements.