Mainly clean-up besides a WIP-method for grid-creation