Cleaned up packages that are not related to simulation