Remove Observer pattern for not being useful in this case