Clean up of tile entity api