Added hints, remove old code.