Removed Aviary and bugfixes