- added observable
 - removed unused classes