remove useless stuff... make interface easier to understand