Changed: Code cleanup, removing unused variables