Feature: removed unneeded code