Removed support library, because it was not needed at all and some small
chagnes