More dev. Removed unneed features.