Started removing stuff time stuff