removed extra stuff and compacted abouts