Removed some dependencies on Styling library