Removed redundant code (refactoring leftovers)