Removed useless logic