Cleanup and implement forgotten method