Remove variable overloading