Improvements on Base components, removed obsolete code