Removed useless temp variables