kill dead code

Take 2. File structure is kept intact this time.