Removed chunks to simplify porting