remove warnings and TODOs