Remove stupid things, add new things