Cleaned Up extra entitys