Code cleanup

Removed everything using standalone packages from apache.com