Updated asides, remove garbage