General Refactoring

Cleaned up future and passed activities