removed and moved unused libraries and includes