removed properties, because function calls are expensive
removed mock, because it was not neccessary
inlined max_out. removed 'not in'-check from add_to_plan method