Prepare for vulcano merge (massive clean-up)

Signed-off-by: Alec Ari <neotheuser@ymail.com>