Removed non-needed variables