cleaned up new stuff