Cleanup
Removed Static annotation to reduce dependencies