removed trailing characters
passed 5/8 integration tests (others not yet implemented)