removed AI, will be added at a later stage, some cleaning