Removed bootstrap and some cleanup