Removing previous mock applications
Minors modifications