Removed weird map stuff