Removed method headers; removed extra file header info