More cleaning - removed unrequired includes, fixed warnings in read_write_methods