Removed some fixed stuff