Removed some weird code