Bugfix: Changed inclusion order and deleted some extra groups