Removed non-needed