remove stupid code :( ...