removed some leftover mess