Fixed issue: removed premature method