#311 removed unnesessary code