Cleaned out, added components