removed no longer needed warnings and such