Removed leftover variables