Finish remove extra stuff, add JS