Removed useless variables