Move deleted space to runtime
Refactored the advertisments